Stichworte: resolve conflict